fixup conflict indicators
authorTim Janik <timj@src.gnome.org>
Tue, 5 Oct 2004 17:31:10 +0000 (17:31 +0000)
committerTim Janik <timj@src.gnome.org>
Tue, 5 Oct 2004 17:31:10 +0000 (17:31 +0000)
commitdc5a39b1369d6f56ea8675903f023896e5ac0dd9
tree2468b5978357f9126301fa18ce20390755149422
parentb9a31bbcb2dfcdf06a4405f369a8487276f78d22
fixup conflict indicators
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8